git merging branches

join shbcf.ru